home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-05-21 | 10.3 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v20 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 14 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 75 73 74 69 6e 62 |piled by| justinb|
|00000020| 40 65 62 6f 6e 79 2e 63 | 72 61 79 2e 63 6f 6d 20 |@ebony.c|ray.com |
|00000030| 6f 6e 20 4d 6f 6e 20 4d | 61 72 20 20 39 20 31 32 |on Mon M|ar 9 12|
|00000040| 3a 34 38 3a 31 37 20 31 | 39 39 38 0a 3b 3b 3b 20 |:48:17 1|998.;;; |
|00000050| 66 72 6f 6d 20 66 69 6c | 65 20 2f 68 6f 6d 65 2f |from fil|e /home/|
|00000060| 61 73 70 65 6e 30 37 2f | 6a 75 73 74 69 6e 62 2f |aspen07/|justinb/|
|00000070| 72 6f 6f 74 73 2f 66 72 | 65 65 77 61 72 65 2f 78 |roots/fr|eeware/x|
|00000080| 65 6d 61 63 73 2f 32 30 | 2e 33 2f 78 65 6d 61 63 |emacs/20|.3/xemac|
|00000090| 73 2d 32 30 2e 33 2f 6c | 69 73 70 2f 65 64 69 66 |s-20.3/l|isp/edif|
|000000a0| 66 2f 65 64 69 66 66 2d | 68 65 6c 70 2e 65 6c 0a |f/ediff-|help.el.|
|000000b0| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|000000c0| 6e 20 32 30 2e 34 20 22 | 45 6d 65 72 61 6c 64 22 |n 20.4 "|Emerald"|
|000000d0| 20 58 45 6d 61 63 73 20 | 20 4c 75 63 69 64 2e 0a | XEmacs | Lucid..|
|000000e0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000f0| 73 69 6f 6e 20 32 2e 32 | 35 20 58 45 6d 61 63 73 |sion 2.2|5 XEmacs|
|00000100| 3b 20 32 32 2d 4d 61 72 | 2d 39 36 2e 0a 3b 3b 3b |; 22-Mar|-96..;;;|
|00000110| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000120| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000130| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000140| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000150| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 39 2e 0a |st in Em|acs 19..|
|00000160| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000170| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000180| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000190| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|000001a0| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|000001b0| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001c0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001d0| 76 65 72 73 69 6f 6e 20 | 22 32 30 22 29 29 29 0a |version |"20"))).|
|000001e0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 60 65 64 69 | (err|or "`edi|
|000001f0| 66 66 2d 68 65 6c 70 2e | 65 6c 27 20 77 61 73 20 |ff-help.|el' was |
|00000200| 63 6f 6d 70 69 6c 65 64 | 20 66 6f 72 20 45 6d 61 |compiled| for Ema|
|00000210| 63 73 20 32 30 22 29 29 | 0a 0a 28 6f 72 20 28 62 |cs 20"))|..(or (b|
|00000220| 6f 75 6e 64 70 20 27 63 | 75 72 72 65 6e 74 2d 6c |oundp 'c|urrent-l|
|00000230| 6f 61 64 2d 6c 69 73 74 | 29 20 28 73 65 74 71 20 |oad-list|) (setq |
|00000240| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00000250| 74 20 6e 69 6c 29 29 0a | 0a 0a 28 62 79 74 65 2d |t nil)).|..(byte-|
|00000260| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 0b 42 13 c4 c5 |code "..|!...B...|
|00000270| 21 87 22 20 5b 70 72 6f | 76 69 64 65 20 65 64 69 |!." [pro|vide edi|
|00000280| 66 66 2d 68 65 6c 70 20 | 65 64 69 66 66 2d 6d 75 |ff-help |ediff-mu|
|00000290| 6c 74 69 66 72 61 6d 65 | 20 63 75 72 72 65 6e 74 |ltiframe| current|
|000002a0| 2d 6c 6f 61 64 2d 6c 69 | 73 74 20 72 65 71 75 69 |-load-li|st requi|
|000002b0| 72 65 20 65 64 69 66 66 | 2d 69 6e 69 74 5d 20 32 |re ediff|-init] 2|
|000002c0| 29 0a 23 40 33 36 20 54 | 68 65 20 68 65 61 64 20 |).#@36 T|he head |
|000002d0| 6f 66 20 74 68 65 20 66 | 75 6c 6c 20 68 65 6c 70 |of the f|ull help|
|000002e0| 20 6d 65 73 73 61 67 65 | 2e 1f 0a 28 64 65 66 63 | message|...(defc|
|000002f0| 6f 6e 73 74 20 65 64 69 | 66 66 2d 6c 6f 6e 67 2d |onst edi|ff-long-|
|00000300| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 2d 68 65 61 |help-mes|sage-hea|
|00000310| 64 20 22 20 20 20 20 4d | 6f 76 65 20 61 72 6f 75 |d " M|ove arou|
|00000320| 6e 64 20 20 20 20 20 20 | 7c 20 20 20 20 20 20 54 |nd || T|
|00000330| 6f 67 67 6c 65 20 66 65 | 61 74 75 72 65 73 20 20 |oggle fe|atures |
|00000340| 20 20 20 20 7c 20 20 20 | 20 20 20 20 20 4d 61 6e | | | Man|
|00000350| 69 70 75 6c 61 74 65 5c | 6e 3d 3d 3d 3d 3d 3d 3d |ipulate\|n=======|
|00000360| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 7c 3d |========|======|=|
|00000370| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00000380| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 7c 3d 3d 3d 3d 3d |========|==|=====|
|00000390| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000003a0| 3d 3d 3d 3d 3d 3d 3d 3d | 22 20 28 23 24 20 2e 20 |========|" (#$ . |
|000003b0| 37 31 31 29 29 0a 23 40 | 33 36 20 54 68 65 20 74 |711)).#@|36 The t|
|000003c0| 61 69 6c 20 6f 66 20 74 | 68 65 20 66 75 6c 6c 2d |ail of t|he full-|
|000003d0| 68 65 6c 70 20 6d 65 73 | 73 61 67 65 2e 1f 0a 28 |help mes|sage...(|
|000003e0| 64 65 66 63 6f 6e 73 74 | 20 65 64 69 66 66 2d 6c |defconst| ediff-l|
|000003f0| 6f 6e 67 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |ong-help|-message|
|00000400| 2d 74 61 69 6c 20 22 3d | 3d 3d 3d 3d 3d 3d 3d 3d |-tail "=|========|
|00000410| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 7c 3d 3d 3d |========|====|===|
|00000420| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00000430| 3d 3d 3d 3d 3d 3d 3d 3d | 7c 3d 3d 3d 3d 3d 3d 3d |========||=======|
|00000440| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00000450| 3d 3d 3d 3d 3d 3d 5c 6e | 20 20 20 20 52 20 2d 73 |======\n| R -s|
|00000460| 68 6f 77 20 72 65 67 69 | 73 74 72 79 20 7c 20 20 |how regi|stry | |
|00000470| 20 20 20 3d 20 2d 63 6f | 6d 70 61 72 65 20 72 65 | = -co|mpare re|
|00000480| 67 69 6f 6e 73 20 20 20 | 20 7c 20 20 4d 20 20 20 |gions | | M |
|00000490| 2d 73 68 6f 77 20 73 65 | 73 73 69 6f 6e 20 67 72 |-show se|ssion gr|
|000004a0| 6f 75 70 20 20 20 20 5c | 6e 20 20 20 20 44 20 2d |oup \|n D -|
|000004b0| 64 69 66 66 20 6f 75 74 | 70 75 74 20 20 20 7c 20 |diff out|put | |
|000004c0| 20 20 20 20 45 20 2d 62 | 72 6f 77 73 65 20 45 64 | E -b|rowse Ed|
|000004d0| 69 66 66 20 6d 61 6e 75 | 61 6c 7c 20 20 47 20 20 |iff manu|al| G |
|000004e0| 20 2d 73 65 6e 64 20 62 | 75 67 20 72 65 70 6f 72 | -send b|ug repor|
|000004f0| 74 20 20 20 20 20 20 20 | 5c 6e 20 20 20 20 69 20 |t |\n i |
|00000500| 2d 73 74 61 74 75 73 20 | 69 6e 66 6f 20 20 20 7c |-status |info ||
|00000510| 20 20 20 20 20 3f 20 2d | 68 65 6c 70 20 6f 66 66 | ? -|help off|
|00000520| 20 20 20 20 20 20 20 20 | 20 20 20 7c 20 20 7a 2f | | | z/|
|00000530| 71 20 2d 73 75 73 70 65 | 6e 64 2f 71 75 69 74 20 |q -suspe|nd/quit |
|00000540| 20 20 20 20 20 20 20 20 | 20 5c 6e 2d 2d 2d 2d 2d | | \n-----|
|00000550| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00000560| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00000570| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00000580| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00000590| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 5c 6e 46 6f 72 20 |--------|--\nFor |
|000005a0| 68 65 6c 70 20 6f 6e 20 | 61 20 73 70 65 63 69 66 |help on |a specif|
|000005b0| 69 63 20 63 6f 6d 6d 61 | 6e 64 3a 20 20 43 6c 69 |ic comma|nd: Cli|
|000005c0| 63 6b 20 42 75 74 74 6f | 6e 20 32 20 6f 76 65 72 |ck Butto|n 2 over|
|000005d0| 20 69 74 3b 20 6f 72 5c | 6e 20 20 20 20 20 20 20 | it; or\|n |
|000005e0| 20 20 20 20 20 20 20 09 | 09 09 20 50 75 74 20 74 | .|.. Put t|
|000005f0| 68 65 20 63 75 72 73 6f | 72 20 6f 76 65 72 20 69 |he curso|r over i|
|00000600| 74 20 61 6e 64 20 74 79 | 70 65 20 52 45 54 2e 22 |t and ty|pe RET."|
|00000610| 20 28 23 24 20 2e 20 39 | 35 35 29 29 0a 23 40 31 | (#$ . 9|55)).#@1|
|00000620| 31 36 20 48 65 6c 70 20 | 6d 65 73 73 61 67 65 20 |16 Help |message |
|00000630| 75 73 75 61 6c 6c 79 20 | 75 73 65 64 20 66 6f 72 |usually |used for|
|00000640| 20 33 2d 77 61 79 20 63 | 6f 6d 70 61 72 69 73 6f | 3-way c|ompariso|
|00000650| 6e 2e 0a 4e 6f 72 6d 61 | 6c 6c 79 2c 20 6e 6f 74 |n..Norma|lly, not|
|00000660| 20 61 20 75 73 65 72 20 | 6f 70 74 69 6f 6e 2e 20 | a user |option. |
|00000670| 53 65 65 20 60 65 64 69 | 66 66 2d 68 65 6c 70 2d |See `edi|ff-help-|
|00000680| 6d 65 73 73 61 67 65 27 | 20 66 6f 72 20 64 65 74 |message'| for det|
|00000690| 61 69 6c 73 2e 1f 0a 28 | 64 65 66 63 6f 6e 73 74 |ails...(|defconst|
|000006a0| 20 65 64 69 66 66 2d 6c | 6f 6e 67 2d 68 65 6c 70 | ediff-l|ong-help|
|000006b0| 2d 6d 65 73 73 61 67 65 | 2d 63 6f 6d 70 61 72 65 |-message|-compare|
|000006c0| 33 20 22 5c 6e 70 2c 44 | 45 4c 20 2d 70 72 65 76 |3 "\np,D|EL -prev|
|000006d0| 69 6f 75 73 20 64 69 66 | 66 20 7c 20 20 20 20 20 |ious dif|f | |
|000006e0| 7c 20 2d 76 65 72 74 2f | 68 6f 72 69 7a 20 73 70 || -vert/|horiz sp|
|000006f0| 6c 69 74 20 20 20 7c 20 | 78 79 20 2d 63 6f 70 79 |lit | |xy -copy|
|00000700| 20 62 75 66 20 58 27 73 | 20 72 65 67 69 6f 6e 20 | buf X's| region |
|00000710| 74 6f 20 59 5c 6e 6e 2c | 53 50 43 20 2d 6e 65 78 |to Y\nn,|SPC -nex|
|00000720| 74 20 64 69 66 66 20 20 | 20 20 20 7c 20 20 20 20 |t diff | | |
|00000730| 20 68 20 2d 68 69 6c 69 | 67 68 74 69 6e 67 20 20 | h -hili|ghting |
|00000740| 20 20 20 20 20 20 20 7c | 20 72 78 20 2d 72 65 73 | || rx -res|
|00000750| 74 6f 72 65 20 62 75 66 | 20 58 27 73 20 6f 6c 64 |tore buf| X's old|
|00000760| 20 64 69 66 66 5c 6e 20 | 20 20 20 6a 20 2d 6a 75 | diff\n | j -ju|
|00000770| 6d 70 20 74 6f 20 64 69 | 66 66 20 20 7c 20 20 20 |mp to di|ff | |
|00000780| 20 20 40 20 2d 61 75 74 | 6f 2d 72 65 66 69 6e 65 | @ -aut|o-refine|
|00000790| 6d 65 6e 74 20 20 20 20 | 7c 20 20 2a 20 2d 72 65 |ment || * -re|
|000007a0| 66 69 6e 65 20 63 75 72 | 72 65 6e 74 20 72 65 67 |fine cur|rent reg|
|000007b0| 69 6f 6e 20 20 20 5c 6e | 20 20 20 67 78 20 2d 67 |ion \n| gx -g|
|000007c0| 6f 74 6f 20 58 27 73 20 | 70 6f 69 6e 74 7c 20 20 |oto X's |point| |
|000007d0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|000007e0| 20 20 20 20 20 20 20 20 | 20 7c 20 20 21 20 2d 75 | | | ! -u|
|000007f0| 70 64 61 74 65 20 64 69 | 66 66 20 72 65 67 69 6f |pdate di|ff regio|
|00000800| 6e 73 20 20 20 20 20 5c | 6e 20 20 43 2d 6c 20 2d |ns \|n C-l -|
|00000810| 72 65 63 65 6e 74 65 72 | 20 20 20 20 20 20 7c 20 |recenter| | |
|00000820| 20 20 20 23 23 20 2d 69 | 67 6e 6f 72 65 20 77 68 | ## -i|gnore wh|
|00000830| 69 74 65 73 70 61 63 65 | 20 20 7c 5c 6e 20 20 76 |itespace| |\n v|
|00000840| 2f 56 20 2d 73 63 72 6f | 6c 6c 20 75 70 2f 64 6e |/V -scro|ll up/dn|
|00000850| 20 20 7c 20 23 66 2f 23 | 68 20 2d 66 6f 63 75 73 | | #f/#|h -focus|
|00000860| 2f 68 69 64 65 20 72 65 | 67 69 6f 6e 73 20 7c 20 |/hide re|gions | |
|00000870| 77 78 20 2d 73 61 76 65 | 20 62 75 66 20 58 20 20 |wx -save| buf X |
|00000880| 20 20 20 20 20 20 20 20 | 20 20 20 20 5c 6e 20 20 | | \n |
|00000890| 3c 2f 3e 20 2d 73 63 72 | 6f 6c 6c 20 6c 74 2f 72 |</> -scr|oll lt/r|
|000008a0| 74 20 20 7c 20 20 20 20 | 20 58 20 2d 72 65 61 64 |t | | X -read|
|000008b0| 2d 6f 6e 6c 79 20 69 6e | 20 62 75 66 20 58 20 7c |-only in| buf X ||
|000008c0| 20 77 64 20 2d 73 61 76 | 65 20 64 69 66 66 20 6f | wd -sav|e diff o|
|000008d0| 75 74 70 75 74 20 20 20 | 20 20 20 20 20 5c 6e 20 |utput | \n |
|000008e0| 20 20 20 7e 20 2d 72 6f | 74 61 74 65 20 62 75 66 | ~ -ro|tate buf|
|000008f0| 66 65 72 73 7c 20 20 20 | 20 20 6d 20 2d 77 69 64 |fers| | m -wid|
|00000900| 65 20 64 69 73 70 6c 61 | 79 20 20 20 20 20 20 20 |e displa|y |
|00000910| 7c 5c 6e 22 20 28 23 24 | 20 2e 20 31 35 37 31 29 ||\n" (#$| . 1571)|
|00000920| 29 0a 23 40 31 31 36 20 | 48 65 6c 70 20 6d 65 73 |).#@116 |Help mes|
|00000930| 73 61 67 65 20 75 73 75 | 61 6c 6c 79 20 75 73 65 |sage usu|ally use|
|00000940| 64 20 66 6f 72 20 32 2d | 77 61 79 20 63 6f 6d 70 |d for 2-|way comp|
|00000950| 61 72 69 73 6f 6e 2e 0a | 4e 6f 72 6d 61 6c 6c 79 |arison..|Normally|
|00000960| 2c 20 6e 6f 74 20 61 20 | 75 73 65 72 20 6f 70 74 |, not a |user opt|
|00000970| 69 6f 6e 2e 20 53 65 65 | 20 60 65 64 69 66 66 2d |ion. See| `ediff-|
|00000980| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 27 20 66 6f |help-mes|sage' fo|
|00000990| 72 20 64 65 74 61 69 6c | 73 2e 1f 0a 28 64 65 66 |r detail|s...(def|
|000009a0| 63 6f 6e 73 74 20 65 64 | 69 66 66 2d 6c 6f 6e 67 |const ed|iff-long|
|000009b0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 2d 63 6f |-help-me|ssage-co|
|000009c0| 6d 70 61 72 65 32 20 22 | 5c 6e 70 2c 44 45 4c 20 |mpare2 "|\np,DEL |
|000009d0| 2d 70 72 65 76 69 6f 75 | 73 20 64 69 66 66 20 7c |-previou|s diff ||
|000009e0| 20 20 20 20 20 7c 20 2d | 76 65 72 74 2f 68 6f 72 | | -|vert/hor|
|000009f0| 69 7a 20 73 70 6c 69 74 | 20 20 20 7c 61 2f 62 20 |iz split| |a/b |
|00000a00| 2d 63 6f 70 79 20 41 2f | 42 27 73 20 72 65 67 69 |-copy A/|B's regi|
|00000a10| 6f 6e 20 74 6f 20 42 2f | 41 5c 6e 6e 2c 53 50 43 |on to B/|A\nn,SPC|
|00000a20| 20 2d 6e 65 78 74 20 64 | 69 66 66 20 20 20 20 20 | -next d|iff |
|00000a30| 7c 20 20 20 20 20 68 20 | 2d 68 69 6c 69 67 68 74 || h |-hilight|
|00000a40| 69 6e 67 20 20 20 20 20 | 20 20 20 20 7c 20 72 78 |ing | | rx|
|00000a50| 20 2d 72 65 73 74 6f 72 | 65 20 62 75 66 20 58 27 | -restor|e buf X'|
|00000a60| 73 20 6f 6c 64 20 64 69 | 66 66 5c 6e 20 20 20 20 |s old di|ff\n |
|00000a70| 6a 20 2d 6a 75 6d 70 20 | 74 6f 20 64 69 66 66 20 |j -jump |to diff |
|00000a80| 20 7c 20 20 20 20 20 40 | 20 2d 61 75 74 6f 2d 72 | | @| -auto-r|
|00000a90| 65 66 69 6e 65 6d 65 6e | 74 20 20 20 20 7c 20 20 |efinemen|t | |
|00000aa0| 2a 20 2d 72 65 66 69 6e | 65 20 63 75 72 72 65 6e |* -refin|e curren|
|00000ab0| 74 20 72 65 67 69 6f 6e | 20 20 20 5c 6e 20 20 20 |t region| \n |
|00000ac0| 67 78 20 2d 67 6f 74 6f | 20 58 27 73 20 70 6f 69 |gx -goto| X's poi|
|00000ad0| 6e 74 7c 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |nt| | |
|00000ae0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 7c 20 | | | |
|00000af0| 20 21 20 2d 75 70 64 61 | 74 65 20 64 69 66 66 20 | ! -upda|te diff |
|00000b00| 72 65 67 69 6f 6e 73 20 | 20 20 20 20 5c 6e 20 20 |regions | \n |
|00000b10| 43 2d 6c 20 2d 72 65 63 | 65 6e 74 65 72 20 20 20 |C-l -rec|enter |
|00000b20| 20 20 20 7c 20 20 20 20 | 23 23 20 2d 69 67 6e 6f | | |## -igno|
|00000b30| 72 65 20 77 68 69 74 65 | 73 70 61 63 65 20 20 7c |re white|space ||
|00000b40| 5c 6e 20 20 76 2f 56 20 | 2d 73 63 72 6f 6c 6c 20 |\n v/V |-scroll |
|00000b50| 75 70 2f 64 6e 20 20 7c | 20 23 66 2f 23 68 20 2d |up/dn || #f/#h -|
|00000b60| 66 6f 63 75 73 2f 68 69 | 64 65 20 72 65 67 69 6f |focus/hi|de regio|
|00000b70| 6e 73 20 7c 20 77 78 20 | 2d 73 61 76 65 20 62 75 |ns | wx |-save bu|
|00000b80| 66 20 58 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |f X | |
|00000b90| 20 5c 6e 20 20 3c 2f 3e | 20 2d 73 63 72 6f 6c 6c | \n </>| -scroll|
|00000ba0| 20 6c 74 2f 72 74 20 20 | 7c 20 20 20 20 20 58 20 | lt/rt || X |
|00000bb0| 2d 72 65 61 64 2d 6f 6e | 6c 79 20 69 6e 20 62 75 |-read-on|ly in bu|
|00000bc0| 66 20 58 20 7c 20 77 64 | 20 2d 73 61 76 65 20 64 |f X | wd| -save d|
|00000bd0| 69 66 66 20 6f 75 74 70 | 75 74 20 20 20 20 20 20 |iff outp|ut |
|00000be0| 20 20 5c 6e 20 20 20 20 | 7e 20 2d 73 77 61 70 20 | \n |~ -swap |
|00000bf0| 76 61 72 69 61 6e 74 73 | 20 7c 20 20 20 20 20 6d |variants| | m|
|00000c00| 20 2d 77 69 64 65 20 64 | 69 73 70 6c 61 79 20 20 | -wide d|isplay |
|00000c10| 20 20 20 20 20 7c 20 20 | 5c 6e 22 20 28 23 24 20 | | |\n" (#$ |
|00000c20| 2e 20 32 33 34 34 29 29 | 0a 23 40 31 32 39 20 48 |. 2344))|.#@129 H|
|00000c30| 65 6c 70 20 6d 65 73 73 | 61 67 65 20 77 68 65 6e |elp mess|age when|
|00000c40| 20 63 6f 6d 70 61 72 69 | 6e 67 20 77 69 6e 64 6f | compari|ng windo|
|00000c50| 77 73 20 6f 72 20 72 65 | 67 69 6f 6e 73 20 6c 69 |ws or re|gions li|
|00000c60| 6e 65 2d 62 79 2d 6c 69 | 6e 65 2e 0a 4e 6f 72 6d |ne-by-li|ne..Norm|
|00000c70| 61 6c 6c 79 2c 20 6e 6f | 74 20 61 20 75 73 65 72 |ally, no|t a user|
|00000c80| 20 6f 70 74 69 6f 6e 2e | 20 53 65 65 20 60 65 64 | option.| See `ed|
|00000c90| 69 66 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |iff-help|-message|
|00000ca0| 27 20 66 6f 72 20 64 65 | 74 61 69 6c 73 2e 1f 0a |' for de|tails...|
|00000cb0| 28 64 65 66 63 6f 6e 73 | 74 20 65 64 69 66 66 2d |(defcons|t ediff-|
|00000cc0| 6c 6f 6e 67 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |long-hel|p-messag|
|00000cd0| 65 2d 6e 61 72 72 6f 77 | 32 20 22 5c 6e 70 2c 44 |e-narrow|2 "\np,D|
|00000ce0| 45 4c 20 2d 70 72 65 76 | 69 6f 75 73 20 64 69 66 |EL -prev|ious dif|
|00000cf0| 66 20 7c 20 20 20 20 20 | 7c 20 2d 76 65 72 74 2f |f | || -vert/|
|00000d00| 68 6f 72 69 7a 20 73 70 | 6c 69 74 20 20 20 7c 61 |horiz sp|lit |a|
|00000d10| 2f 62 20 2d 63 6f 70 79 | 20 41 2f 42 27 73 20 72 |/b -copy| A/B's r|
|00000d20| 65 67 69 6f 6e 20 74 6f | 20 42 2f 41 5c 6e 6e 2c |egion to| B/A\nn,|
|00000d30| 53 50 43 20 2d 6e 65 78 | 74 20 64 69 66 66 20 20 |SPC -nex|t diff |
|00000d40| 20 20 20 7c 20 20 20 20 | 20 68 20 2d 68 69 6c 69 | | | h -hili|
|00000d50| 67 68 74 69 6e 67 20 20 | 20 20 20 20 20 20 20 7c |ghting | ||
|00000d60| 20 72 78 20 2d 72 65 73 | 74 6f 72 65 20 62 75 66 | rx -res|tore buf|
|00000d70| 20 58 27 73 20 6f 6c 64 | 20 64 69 66 66 5c 6e 20 | X's old| diff\n |
|00000d80| 20 20 20 6a 20 2d 6a 75 | 6d 70 20 74 6f 20 64 69 | j -ju|mp to di|
|00000d90| 66 66 20 20 7c 20 20 20 | 20 20 40 20 2d 61 75 74 |ff | | @ -aut|
|00000da0| 6f 2d 72 65 66 69 6e 65 | 6d 65 6e 74 20 20 20 20 |o-refine|ment |
|00000db0| 7c 20 20 2a 20 2d 72 65 | 66 69 6e 65 20 63 75 72 || * -re|fine cur|
|00000dc0| 72 65 6e 74 20 72 65 67 | 69 6f 6e 20 20 20 5c 6e |rent reg|ion \n|
|00000dd0| 20 20 20 67 78 20 2d 67 | 6f 74 6f 20 58 27 73 20 | gx -g|oto X's |
|00000de0| 70 6f 69 6e 74 7c 20 20 | 20 20 20 25 20 2d 6e 61 |point| | % -na|
|00000df0| 72 72 6f 77 2f 77 69 64 | 65 6e 20 62 75 66 66 73 |rrow/wid|en buffs|
|00000e00| 20 7c 20 20 21 20 2d 75 | 70 64 61 74 65 20 64 69 | | ! -u|pdate di|
|00000e10| 66 66 20 72 65 67 69 6f | 6e 73 20 20 20 20 20 5c |ff regio|ns \|
|00000e20| 6e 20 20 43 2d 6c 20 2d | 72 65 63 65 6e 74 65 72 |n C-l -|recenter|
|00000e30| 20 20 20 20 20 20 7c 20 | 20 20 20 23 23 20 2d 69 | | | ## -i|
|00000e40| 67 6e 6f 72 65 20 77 68 | 69 74 65 73 70 61 63 65 |gnore wh|itespace|
|00000e50| 20 20 7c 5c 6e 20 20 76 | 2f 56 20 2d 73 63 72 6f | |\n v|/V -scro|
|00000e60| 6c 6c 20 75 70 2f 64 6e | 20 20 7c 20 23 66 2f 23 |ll up/dn| | #f/#|
|00000e70| 68 20 2d 66 6f 63 75 73 | 2f 68 69 64 65 20 72 65 |h -focus|/hide re|
|00000e80| 67 69 6f 6e 73 20 7c 20 | 77 78 20 2d 73 61 76 65 |gions | |wx -save|
|00000e90| 20 62 75 66 20 58 20 20 | 20 20 20 20 20 20 20 20 | buf X | |
|00000ea0| 20 20 20 20 5c 6e 20 20 | 3c 2f 3e 20 2d 73 63 72 | \n |</> -scr|
|00000eb0| 6f 6c 6c 20 6c 74 2f 72 | 74 20 20 7c 20 20 20 20 |oll lt/r|t | |
|00000ec0| 20 58 20 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 69 6e | X -read|-only in|
|00000ed0| 20 62 75 66 20 58 20 7c | 20 77 64 20 2d 73 61 76 | buf X || wd -sav|
|00000ee0| 65 20 64 69 66 66 20 6f | 75 74 70 75 74 20 20 20 |e diff o|utput |
|00000ef0| 20 20 20 20 20 5c 6e 20 | 20 20 20 7e 20 2d 73 77 | \n | ~ -sw|
|00000f00| 61 70 20 76 61 72 69 61 | 6e 74 73 20 7c 20 20 20 |ap varia|nts | |
|00000f10| 20 20 6d 20 2d 77 69 64 | 65 20 64 69 73 70 6c 61 | m -wid|e displa|
|00000f20| 79 20 20 20 20 20 20 20 | 7c 20 20 5c 6e 22 20 28 |y || \n" (|
|00000f30| 23 24 20 2e 20 33 31 31 | 39 29 29 0a 23 40 31 32 |#$ . 311|9)).#@12|
|00000f40| 39 20 48 65 6c 70 20 6d | 65 73 73 61 67 65 20 77 |9 Help m|essage w|
|00000f50| 68 65 6e 20 63 6f 6d 70 | 61 72 69 6e 67 20 77 69 |hen comp|aring wi|
|00000f60| 6e 64 6f 77 73 20 6f 72 | 20 72 65 67 69 6f 6e 73 |ndows or| regions|
|00000f70| 20 77 6f 72 64 2d 62 79 | 2d 77 6f 72 64 2e 0a 4e | word-by|-word..N|
|00000f80| 6f 72 6d 61 6c 6c 79 2c | 20 6e 6f 74 20 61 20 75 |ormally,| not a u|
|00000f90| 73 65 72 20 6f 70 74 69 | 6f 6e 2e 20 53 65 65 20 |ser opti|on. See |
|00000fa0| 60 65 64 69 66 66 2d 68 | 65 6c 70 2d 6d 65 73 73 |`ediff-h|elp-mess|
|00000fb0| 61 67 65 27 20 66 6f 72 | 20 64 65 74 61 69 6c 73 |age' for| details|
|00000fc0| 2e 1f 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |...(defc|onst edi|
|00000fd0| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00000fe0| 73 61 67 65 2d 77 6f 72 | 64 2d 6d 6f 64 65 20 22 |sage-wor|d-mode "|
|00000ff0| 5c 6e 70 2c 44 45 4c 20 | 2d 70 72 65 76 69 6f 75 |\np,DEL |-previou|
|00001000| 73 20 64 69 66 66 20 7c | 20 20 20 20 20 7c 20 2d |s diff || | -|
|00001010| 76 65 72 74 2f 68 6f 72 | 69 7a 20 73 70 6c 69 74 |vert/hor|iz split|
|00001020| 20 20 20 7c 20 78 79 20 | 2d 63 6f 70 79 20 62 75 | | xy |-copy bu|
|00001030| 66 20 58 27 73 20 72 65 | 67 69 6f 6e 20 74 6f 20 |f X's re|gion to |
|00001040| 59 5c 6e 6e 2c 53 50 43 | 20 2d 6e 65 78 74 20 64 |Y\nn,SPC| -next d|
|00001050| 69 66 66 20 20 20 20 20 | 7c 20 20 20 20 20 68 20 |iff || h |
|00001060| 2d 68 69 6c 69 67 68 74 | 69 6e 67 20 20 20 20 20 |-hilight|ing |
|00001070| 20 20 20 20 7c 20 72 78 | 20 2d 72 65 73 74 6f 72 | | rx| -restor|
|00001080| 65 20 62 75 66 20 58 27 | 73 20 6f 6c 64 20 64 69 |e buf X'|s old di|
|00001090| 66 66 5c 6e 20 20 20 20 | 6a 20 2d 6a 75 6d 70 20 |ff\n |j -jump |
|000010a0| 74 6f 20 64 69 66 66 20 | 20 7c 20 20 20 20 20 20 |to diff | | |
|000010b0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|000010c0| 20 20 20 20 20 7c 20 20 | 20 20 20 20 20 20 20 20 | | | |
|000010d0| 20 20 20 20 20 20 20 20 | 20 5c 6e 20 20 20 67 78 | | \n gx|
|000010e0| 20 2d 67 6f 74 6f 20 58 | 27 73 20 70 6f 69 6e 74 | -goto X|'s point|
|000010f0| 7c 20 20 20 20 20 25 20 | 2d 6e 61 72 72 6f 77 2f || % |-narrow/|
|00001100| 77 69 64 65 6e 20 62 75 | 66 66 73 20 7c 20 20 21 |widen bu|ffs | !|
|00001110| 20 2d 72 65 63 6f 6d 70 | 75 74 65 20 64 69 66 66 | -recomp|ute diff|
|00001120| 73 20 20 20 20 20 20 20 | 20 20 5c 6e 20 20 43 2d |s | \n C-|
|00001130| 6c 20 2d 72 65 63 65 6e | 74 65 72 20 20 20 20 20 |l -recen|ter |
|00001140| 20 7c 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | | |
|00001150| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 7c 5c 6e | | |\n|
|00001160| 20 20 76 2f 56 20 2d 73 | 63 72 6f 6c 6c 20 75 70 | v/V -s|croll up|
|00001170| 2f 64 6e 20 20 7c 20 23 | 66 2f 23 68 20 2d 66 6f |/dn | #|f/#h -fo|
|00001180| 63 75 73 2f 68 69 64 65 | 20 72 65 67 69 6f 6e 73 |cus/hide| regions|
|00001190| 20 7c 20 77 78 20 2d 73 | 61 76 65 20 62 75 66 20 | | wx -s|ave buf |
|000011a0| 58 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 5c |X | \|
|000011b0| 6e 20 20 3c 2f 3e 20 2d | 73 63 72 6f 6c 6c 20 6c |n </> -|scroll l|
|000011c0| 74 2f 72 74 20 20 7c 20 | 20 20 20 20 58 20 2d 72 |t/rt | | X -r|
|000011d0| 65 61 64 2d 6f 6e 6c 79 | 20 69 6e 20 62 75 66 20 |ead-only| in buf |
|000011e0| 58 20 7c 20 77 64 20 2d | 73 61 76 65 20 64 69 66 |X | wd -|save dif|
|000011f0| 66 20 6f 75 74 70 75 74 | 20 20 20 20 20 20 20 20 |f output| |
|00001200| 5c 6e 20 20 20 20 7e 20 | 2d 73 77 61 70 20 76 61 |\n ~ |-swap va|
|00001210| 72 69 61 6e 74 73 20 7c | 20 20 20 20 20 6d 20 2d |riants || m -|
|00001220| 77 69 64 65 20 64 69 73 | 70 6c 61 79 20 20 20 20 |wide dis|play |
|00001230| 20 20 20 7c 20 20 5c 6e | 22 20 28 23 24 20 2e 20 | | \n|" (#$ . |
|00001240| 33 39 30 36 29 29 0a 23 | 40 39 37 20 48 65 6c 70 |3906)).#|@97 Help|
|00001250| 20 6d 65 73 73 61 67 65 | 20 64 75 72 69 6e 67 20 | message| during |
|00001260| 6d 65 72 67 69 6e 67 2e | 0a 4e 6f 72 6d 61 6c 6c |merging.|.Normall|
|00001270| 79 2c 20 6e 6f 74 20 61 | 20 75 73 65 72 20 6f 70 |y, not a| user op|
|00001280| 74 69 6f 6e 2e 20 53 65 | 65 20 60 65 64 69 66 66 |tion. Se|e `ediff|
|00001290| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 27 20 66 |-help-me|ssage' f|
|000012a0| 6f 72 20 64 65 74 61 69 | 6c 73 2e 1f 0a 28 64 65 |or detai|ls...(de|
|000012b0| 66 63 6f 6e 73 74 20 65 | 64 69 66 66 2d 6c 6f 6e |fconst e|diff-lon|
|000012c0| 67 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 2d 6d |g-help-m|essage-m|
|000012d0| 65 72 67 65 20 22 5c 6e | 70 2c 44 45 4c 20 2d 70 |erge "\n|p,DEL -p|
|000012e0| 72 65 76 69 6f 75 73 20 | 64 69 66 66 20 7c 20 20 |revious |diff | |
|000012f0| 20 20 20 7c 20 2d 76 65 | 72 74 2f 68 6f 72 69 7a | | -ve|rt/horiz|
|00001300| 20 73 70 6c 69 74 20 20 | 20 7c 20 20 78 20 2d 63 | split | | x -c|
|00001310| 6f 70 79 20 62 75 66 20 | 58 27 73 20 72 65 67 69 |opy buf |X's regi|
|00001320| 6f 6e 20 74 6f 20 43 5c | 6e 6e 2c 53 50 43 20 2d |on to C\|nn,SPC -|
|00001330| 6e 65 78 74 20 64 69 66 | 66 20 20 20 20 20 7c 20 |next dif|f | |
|00001340| 20 20 20 20 68 20 2d 68 | 69 6c 69 67 68 74 69 6e | h -h|ilightin|
|00001350| 67 20 20 20 20 20 20 20 | 20 20 7c 20 20 72 20 2d |g | | r -|
|00001360| 72 65 73 74 6f 72 65 20 | 62 75 66 20 43 27 73 20 |restore |buf C's |
|00001370| 6f 6c 64 20 64 69 66 66 | 5c 6e 20 20 20 20 6a 20 |old diff|\n j |
|00001380| 2d 6a 75 6d 70 20 74 6f | 20 64 69 66 66 20 20 7c |-jump to| diff ||
|00001390| 20 20 20 20 20 40 20 2d | 61 75 74 6f 2d 72 65 66 | @ -|auto-ref|
|000013a0| 69 6e 65 6d 65 6e 74 20 | 20 20 20 7c 20 20 2a 20 |inement | | * |
|000013b0| 2d 72 65 66 69 6e 65 20 | 63 75 72 72 65 6e 74 20 |-refine |current |
|000013c0| 72 65 67 69 6f 6e 20 20 | 20 5c 6e 20 20 20 67 78 |region | \n gx|
|000013d0| 20 2d 67 6f 74 6f 20 58 | 27 73 20 70 6f 69 6e 74 | -goto X|'s point|
|000013e0| 7c 20 20 20 20 23 23 20 | 2d 69 67 6e 6f 72 65 20 || ## |-ignore |
|000013f0| 77 68 69 74 65 73 70 61 | 63 65 20 20 7c 20 20 21 |whitespa|ce | !|
|00001400| 20 2d 75 70 64 61 74 65 | 20 64 69 66 66 20 72 65 | -update| diff re|
|00001410| 67 69 6f 6e 73 20 20 20 | 20 20 5c 6e 20 20 43 2d |gions | \n C-|
|00001420| 6c 20 2d 72 65 63 65 6e | 74 65 72 20 20 20 20 20 |l -recen|ter |
|00001430| 20 7c 20 23 66 2f 23 68 | 20 2d 66 6f 63 75 73 2f | | #f/#h| -focus/|
|00001440| 68 69 64 65 20 72 65 67 | 69 6f 6e 73 20 7c 20 20 |hide reg|ions | |
|00001450| 2b 20 2d 63 6f 6d 62 69 | 6e 65 20 64 69 66 66 20 |+ -combi|ne diff |
|00001460| 72 65 67 69 6f 6e 73 20 | 20 20 20 5c 6e 20 20 76 |regions | \n v|
|00001470| 2f 56 20 2d 73 63 72 6f | 6c 6c 20 75 70 2f 64 6e |/V -scro|ll up/dn|
|00001480| 20 20 7c 20 20 20 20 20 | 58 20 2d 72 65 61 64 2d | | |X -read-|
|00001490| 6f 6e 6c 79 20 69 6e 20 | 62 75 66 20 58 20 7c 20 |only in |buf X | |
|000014a0| 77 78 20 2d 73 61 76 65 | 20 62 75 66 20 58 20 20 |wx -save| buf X |
|000014b0| 20 20 20 20 20 20 20 20 | 20 20 20 20 5c 6e 20 20 | | \n |
|000014c0| 3c 2f 3e 20 2d 73 63 72 | 6f 6c 6c 20 6c 74 2f 72 |</> -scr|oll lt/r|
|000014d0| 74 20 20 7c 20 20 20 20 | 20 6d 20 2d 77 69 64 65 |t | | m -wide|
|000014e0| 20 64 69 73 70 6c 61 79 | 20 20 20 20 20 20 20 7c | display| ||
|000014f0| 20 77 64 20 2d 73 61 76 | 65 20 64 69 66 66 20 6f | wd -sav|e diff o|
|00001500| 75 74 70 75 74 20 20 20 | 20 20 20 20 20 5c 6e 20 |utput | \n |
|00001510| 20 20 20 7e 20 2d 73 77 | 61 70 20 76 61 72 69 61 | ~ -sw|ap varia|
|00001520| 6e 74 73 20 7c 20 20 20 | 20 20 73 20 2d 73 68 72 |nts | | s -shr|
|00001530| 69 6e 6b 20 77 69 6e 64 | 6f 77 20 43 20 20 20 20 |ink wind|ow C |
|00001540| 7c 20 20 2f 20 2d 73 68 | 6f 77 20 61 6e 63 65 73 || / -sh|ow ances|
|00001550| 74 6f 72 20 62 75 66 66 | 20 20 20 20 20 20 5c 6e |tor buff| \n|
|00001560| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00001570| 20 20 20 20 20 7c 20 20 | 20 20 20 24 20 2d 73 68 | | | $ -sh|
|00001580| 6f 77 20 63 6c 61 73 68 | 65 73 20 6f 6e 6c 79 20 |ow clash|es only |
|00001590| 20 7c 20 20 26 20 2d 6d | 65 72 67 65 20 77 2f 6e | | & -m|erge w/n|
|000015a0| 65 77 20 64 65 66 61 75 | 6c 74 20 20 20 20 20 5c |ew defau|lt \|
|000015b0| 6e 22 20 28 23 24 20 2e | 20 34 36 38 34 29 29 0a |n" (#$ .| 4684)).|
|000015c0| 23 40 36 38 20 4e 6f 72 | 6d 61 6c 6c 79 2c 20 6e |#@68 Nor|mally, n|
|000015d0| 6f 74 20 61 20 75 73 65 | 72 20 6f 70 74 69 6f 6e |ot a use|r option|
|000015e0| 2e 20 53 65 65 20 60 65 | 64 69 66 66 2d 68 65 6c |. See `e|diff-hel|
|000015f0| 70 2d 6d 65 73 73 61 67 | 65 27 20 66 6f 72 20 64 |p-messag|e' for d|
|00001600| 65 74 61 69 6c 73 2e 1f | 0a 28 64 65 66 76 61 72 |etails..|.(defvar|
|00001610| 20 65 64 69 66 66 2d 6c | 6f 6e 67 2d 68 65 6c 70 | ediff-l|ong-help|
|00001620| 2d 6d 65 73 73 61 67 65 | 20 22 22 20 28 23 24 20 |-message| "" (#$ |
|00001630| 2e 20 35 35 37 33 29 29 | 0a 28 62 79 74 65 2d 63 |. 5573))|.(byte-c|
|00001640| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00001650| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00001660| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|00001670| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00001680| 73 61 67 65 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |sage put| permane|
|00001690| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 23 |nt-local| t] 4).#|
|000016a0| 40 33 37 20 43 6f 6e 74 | 65 6e 74 73 20 6f 66 20 |@37 Cont|ents of |
|000016b0| 74 68 65 20 62 72 69 65 | 66 20 68 65 6c 70 20 6d |the brie|f help m|
|000016c0| 65 73 73 61 67 65 2e 1f | 0a 28 64 65 66 63 6f 6e |essage..|.(defcon|
|000016d0| 73 74 20 65 64 69 66 66 | 2d 62 72 69 65 66 2d 6d |st ediff|-brief-m|
|000016e0| 65 73 73 61 67 65 2d 73 | 74 72 69 6e 67 20 22 3f |essage-s|tring "?|
|000016f0| 20 2d 71 75 69 63 6b 20 | 68 65 6c 70 20 22 20 28 | -quick |help " (|
|00001700| 23 24 20 2e 20 35 37 39 | 36 29 29 0a 23 40 36 38 |#$ . 579|6)).#@68|
|00001710| 20 4e 6f 72 6d 61 6c 6c | 79 2c 20 6e 6f 74 20 61 | Normall|y, not a|
|00001720| 20 75 73 65 72 20 6f 70 | 74 69 6f 6e 2e 20 53 65 | user op|tion. Se|
|00001730| 65 20 60 65 64 69 66 66 | 2d 68 65 6c 70 2d 6d 65 |e `ediff|-help-me|
|00001740| 73 73 61 67 65 27 20 66 | 6f 72 20 64 65 74 61 69 |ssage' f|or detai|
|00001750| 6c 73 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ls...(de|fvar edi|
|00001760| 66 66 2d 62 72 69 65 66 | 2d 68 65 6c 70 2d 6d 65 |ff-brief|-help-me|
|00001770| 73 73 61 67 65 20 22 22 | 20 28 23 24 20 2e 20 35 |ssage ""| (#$ . 5|
|00001780| 39 30 35 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |905)).(b|yte-code|
|00001790| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|000017a0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000017b0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000017c0| 62 72 69 65 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |brief-he|lp-messa|
|000017d0| 67 65 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ge put p|ermanent|
|000017e0| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 23 40 31 |-local t|] 4).#@1|
|000017f0| 39 34 20 54 68 65 20 62 | 72 69 65 66 20 68 65 6c |94 The b|rief hel|
|00001800| 70 20 6d 65 73 73 61 67 | 65 20 74 68 61 74 20 74 |p messag|e that t|
|00001810| 68 65 20 75 73 65 72 20 | 63 61 6e 20 63 75 73 74 |he user |can cust|
|00001820| 6f 6d 69 7a 65 2e 0a 49 | 66 20 74 68 65 20 75 73 |omize..I|f the us|
|00001830| 65 72 20 73 65 74 73 20 | 74 68 69 73 20 74 6f 20 |er sets |this to |
|00001840| 61 20 70 61 72 61 6d 65 | 74 65 72 2d 6c 65 73 73 |a parame|ter-less|
|00001850| 20 66 75 6e 63 74 69 6f | 6e 2c 20 45 64 69 66 66 | functio|n, Ediff|
|00001860| 20 77 69 6c 6c 20 75 73 | 65 20 69 74 20 74 6f 0a | will us|e it to.|
|00001870| 70 72 6f 64 75 63 65 20 | 74 68 65 20 62 72 69 65 |produce |the brie|
|00001880| 66 20 68 65 6c 70 20 6d | 65 73 73 61 67 65 2e 20 |f help m|essage. |
|00001890| 54 68 69 73 20 66 75 6e | 63 74 69 6f 6e 20 6d 75 |This fun|ction mu|
|000018a0| 73 74 20 72 65 74 75 72 | 6e 20 61 20 73 74 72 69 |st retur|n a stri|
|000018b0| 6e 67 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ng...(de|fvar edi|
|000018c0| 66 66 2d 62 72 69 65 66 | 2d 68 65 6c 70 2d 6d 65 |ff-brief|-help-me|
|000018d0| 73 73 61 67 65 2d 66 75 | 6e 63 74 69 6f 6e 20 6e |ssage-fu|nction n|
|000018e0| 69 6c 20 28 23 24 20 2e | 20 36 31 33 31 29 29 0a |il (#$ .| 6131)).|
|000018f0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00001900| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00001910| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00001920| 63 61 6c 20 65 64 69 66 | 66 2d 62 72 69 65 66 2d |cal edif|f-brief-|
|00001930| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 2d 66 75 6e |help-mes|sage-fun|
|00001940| 63 74 69 6f 6e 20 70 75 | 74 20 70 65 72 6d 61 6e |ction pu|t perman|
|00001950| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00001960| 23 40 31 30 32 20 54 68 | 65 20 6c 6f 6e 67 20 68 |#@102 Th|e long h|
|00001970| 65 6c 70 20 6d 65 73 73 | 61 67 65 20 74 68 61 74 |elp mess|age that|
|00001980| 20 74 68 65 20 75 73 65 | 72 20 63 61 6e 20 63 75 | the use|r can cu|
|00001990| 73 74 6f 6d 69 7a 65 2e | 0a 53 65 65 20 60 65 64 |stomize.|.See `ed|
|000019a0| 69 66 66 2d 62 72 69 65 | 66 2d 68 65 6c 70 2d 6d |iff-brie|f-help-m|
|000019b0| 65 73 73 61 67 65 2d 66 | 75 6e 63 74 69 6f 6e 27 |essage-f|unction'|
|000019c0| 20 66 6f 72 20 6d 6f 72 | 65 2e 1f 0a 28 64 65 66 | for mor|e...(def|
|000019d0| 76 61 72 20 65 64 69 66 | 66 2d 6c 6f 6e 67 2d 68 |var edif|f-long-h|
|000019e0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 2d 66 75 6e 63 |elp-mess|age-func|
|000019f0| 74 69 6f 6e 20 6e 69 6c | 20 28 23 24 20 2e 20 36 |tion nil| (#$ . 6|
|00001a00| 35 30 32 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |502)).(b|yte-code|
|00001a10| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00001a20| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00001a30| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00001a40| 6c 6f 6e 67 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |long-hel|p-messag|
|00001a50| 65 2d 66 75 6e 63 74 69 | 6f 6e 20 70 75 74 20 70 |e-functi|on put p|
|00001a60| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00001a70| 5d 20 34 29 0a 23 40 37 | 34 20 2a 49 66 20 74 2c |] 4).#@7|4 *If t,|
|00001a80| 20 45 64 69 66 66 20 64 | 69 73 70 6c 61 79 73 20 | Ediff d|isplays |
|00001a90| 61 20 6c 6f 6e 67 20 68 | 65 6c 70 20 6d 65 73 73 |a long h|elp mess|
|00001aa0| 61 67 65 2e 20 53 68 6f | 72 74 20 68 65 6c 70 20 |age. Sho|rt help |
|00001ab0| 6d 65 73 73 61 67 65 20 | 6f 74 68 65 72 77 69 73 |message |otherwis|
|00001ac0| 65 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |e...(def|var edif|
|00001ad0| 66 2d 75 73 65 2d 6c 6f | 6e 67 2d 68 65 6c 70 2d |f-use-lo|ng-help-|
|00001ae0| 6d 65 73 73 61 67 65 20 | 6e 69 6c 20 28 23 24 20 |message |nil (#$ |
|00001af0| 2e 20 2d 36 37 37 38 29 | 29 0a 23 40 32 36 33 20 |. -6778)|).#@263 |
|00001b00| 54 68 65 20 61 63 74 75 | 61 6c 20 68 65 6c 70 20 |The actu|al help |
|00001b10| 6d 65 73 73 61 67 65 2e | 0a 4e 6f 72 6d 61 6c 6c |message.|.Normall|
|00001b20| 79 2c 20 74 68 65 20 75 | 73 65 72 20 73 68 6f 75 |y, the u|ser shou|
|00001b30| 6c 64 6e 27 74 20 74 6f | 75 63 68 20 74 68 69 73 |ldn't to|uch this|
|00001b40| 2e 20 48 6f 77 65 76 65 | 72 2c 20 69 66 20 79 6f |. Howeve|r, if yo|
|00001b50| 75 20 77 61 6e 74 20 45 | 64 69 66 66 20 74 6f 0a |u want E|diff to.|
|00001b60| 73 74 61 72 74 20 75 70 | 20 77 69 74 68 20 64 69 |start up| with di|
|00001b70| 66 66 65 72 65 6e 74 20 | 68 65 6c 70 20 6d 65 73 |fferent |help mes|
|00001b80| 73 61 67 65 73 20 66 6f | 72 20 64 69 66 66 65 72 |sages fo|r differ|
|00001b90| 65 6e 74 20 6a 6f 62 73 | 2c 20 79 6f 75 20 63 61 |ent jobs|, you ca|
|00001ba0| 6e 20 63 68 61 6e 67 65 | 0a 74 68 65 20 76 61 6c |n change|.the val|
|00001bb0| 75 65 20 6f 66 20 74 68 | 69 73 20 76 61 72 69 61 |ue of th|is varia|
|00001bc0| 62 6c 65 20 61 6e 64 20 | 74 68 65 20 76 61 72 69 |ble and |the vari|
|00001bd0| 61 62 6c 65 73 20 60 65 | 64 69 66 66 2d 68 65 6c |ables `e|diff-hel|
|00001be0| 70 2d 6d 65 73 73 61 67 | 65 2d 2a 27 20 69 6e 0a |p-messag|e-*' in.|
|00001bf0| 60 65 64 69 66 66 2d 73 | 74 61 72 74 75 70 2d 68 |`ediff-s|tartup-h|
|00001c00| 6f 6f 6b 27 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |ook'...(|defvar e|
|00001c10| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00001c20| 65 20 22 22 20 28 23 24 | 20 2e 20 36 39 31 32 29 |e "" (#$| . 6912)|
|00001c30| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00001c40| 21 88 c2 c1 c3 c4 23 88 | c5 c6 21 ac 84 c7 20 16 |!.....#.|..!... .|
|00001c50| 06 c6 0e 08 42 16 08 c9 | 0e 06 0e 5c 6e ab 83 cb |....B...|...\n...|
|00001c60| aa 81 cc cd 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00001c70| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00001c80| 63 61 6c 20 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |cal edif|f-help-m|
|00001c90| 65 73 73 61 67 65 20 70 | 75 74 20 70 65 72 6d 61 |essage p|ut perma|
|00001ca0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 20 62 6f 75 |nent-loc|al t bou|
|00001cb0| 6e 64 70 20 65 64 69 66 | 66 2d 68 65 6c 70 2d 72 |ndp edif|f-help-r|
|00001cc0| 65 67 69 6f 6e 2d 6d 61 | 70 20 6d 61 6b 65 2d 73 |egion-ma|p make-s|
|00001cd0| 70 61 72 73 65 2d 6b 65 | 79 6d 61 70 20 63 75 72 |parse-ke|ymap cur|
|00001ce0| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 20 64 |rent-loa|d-list d|
|00001cf0| 65 66 69 6e 65 2d 6b 65 | 79 20 65 64 69 66 66 2d |efine-ke|y ediff-|
|00001d00| 65 6d 61 63 73 2d 70 20 | 5b 6d 6f 75 73 65 2d 32 |emacs-p |[mouse-2|
|00001d10| 5d 20 5b 62 75 74 74 6f | 6e 32 5d 20 65 64 69 66 |] [butto|n2] edif|
|00001d20| 66 2d 68 65 6c 70 2d 66 | 6f 72 2d 71 75 69 63 6b |f-help-f|or-quick|
|00001d30| 2d 68 65 6c 70 5d 20 34 | 29 0a 28 64 65 66 61 6c |-help] 4|).(defal|
|00001d40| 69 61 73 20 27 65 64 69 | 66 66 2d 73 65 74 2d 68 |ias 'edi|ff-set-h|
|00001d50| 65 6c 70 2d 6f 76 65 72 | 6c 61 79 73 20 23 5b 6e |elp-over|lays #[n|
|00001d60| 69 6c 20 22 65 62 88 c0 | 89 89 89 19 1a 1b 1c c5 |il "eb..|........|
|00001d70| c6 c0 c7 23 ad ab c8 94 | 13 c8 95 12 c9 94 c9 95 |...#....|........|
|00001d80| 7b 11 ca 0b 5c 6e 5c 22 | 14 0e 0b ab 88 cc 0c cd |{...\n\"|........|
|00001d90| ce 23 88 aa 86 cc 0c ce | cf 23 88 cc 0c d0 09 23 |.#......|.#.....#|
|00001da0| 88 aa 4e 2c 87 22 20 5b | 6e 69 6c 20 63 6d 64 20 |..N,." [|nil cmd |
|00001db0| 65 6e 64 20 62 65 67 20 | 6f 76 65 72 6c 20 72 65 |end beg |overl re|
|00001dc0| 2d 73 65 61 72 63 68 2d | 66 6f 72 77 61 72 64 20 |-search-|forward |
|00001dd0| 22 20 2a 5c 5c 28 5b 5e | 20 09 5c 6e 7c 5d 2b 5c |" *\\([^| .\n|]+\|
|00001de0| 5c 7c 7c 5c 5c 29 20 2b | 2d 5b 5e 7c 5c 6e 5d 2b |\||\\) +|-[^|\n]+|
|00001df0| 22 20 6e 6f 65 72 72 6f | 72 20 30 20 31 20 65 64 |" noerro|r 0 1 ed|
|00001e00| 69 66 66 2d 6d 61 6b 65 | 2d 6f 76 65 72 6c 61 79 |iff-make|-overlay|
|00001e10| 20 65 64 69 66 66 2d 65 | 6d 61 63 73 2d 70 20 65 | ediff-e|macs-p e|
|00001e20| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 70 75 74 |diff-ove|rlay-put|
|00001e30| 20 6d 6f 75 73 65 2d 66 | 61 63 65 20 68 69 67 68 | mouse-f|ace high|
|00001e40| 6c 69 67 68 74 20 74 20 | 65 64 69 66 66 2d 68 65 |light t |ediff-he|
|00001e50| 6c 70 2d 69 6e 66 6f 5d | 20 34 5d 29 0a 23 40 34 |lp-info]| 4]).#@4|
|00001e60| 30 20 45 78 70 6c 61 69 | 6e 20 45 64 69 66 66 20 |0 Explai|n Ediff |
|00001e70| 63 6f 6d 6d 61 6e 64 73 | 20 69 6e 20 6d 6f 72 65 |commands| in more|
|00001e80| 20 64 65 74 61 69 6c 2e | 1f 0a 28 64 65 66 61 6c | detail.|..(defal|
|00001e90| 69 61 73 20 27 65 64 69 | 66 66 2d 68 65 6c 70 2d |ias 'edi|ff-help-|
|00001ea0| 66 6f 72 2d 71 75 69 63 | 6b 2d 68 65 6c 70 20 23 |for-quic|k-help #|
|00001eb0| 5b 6e 69 6c 20 22 c0 19 | c2 09 21 ac 85 c3 c4 0d |[nil "..|..!.....|
|00001ec0| 5c 22 88 29 c6 0e 07 21 | c0 89 1e 08 1e 09 1e 5c |\".)...!|.......\|
|00001ed0| 6e 0e 0b ab 91 cc 0e 5c | 6e 70 cd 23 16 09 ce 0e |n......\|np.#....|
|00001ee0| 09 cd 5c 22 16 08 aa 8a | cf d0 d1 0e 5c 6e 21 5c |..\"....|....\n!\|
|00001ef0| 22 40 16 08 0e 08 3b ac | 84 c3 d2 21 88 d3 d4 21 |"@....;.|...!...!|
|00001f00| 88 c0 1e 15 0e 08 d6 98 | ab 86 d7 d8 21 82 60 02 |........|....!.`.|
|00001f10| 0e 08 d9 98 ab 86 d7 da | 21 82 60 02 0e 08 db 98 |........|!.`.....|
|00001f20| ab 86 d7 dc 21 82 60 02 | 0e 08 dd 98 ab 86 d7 de |....!.`.|........|
|00001f30| 21 82 60 02 0e 08 df 98 | ab 86 d7 e0 21 82 60 02 |!.`.....|....!.`.|
|00001f40| 0e 08 e1 98 ab 86 d7 e2 | 21 82 60 02 0e 08 e3 98 |........|!.`.....|
|00001f50| ab 86 d7 e2 21 82 60 02 | 0e 08 e4 98 ab 86 d7 e5 |....!.`.|........|
|00001f60| 21 82 60 02 0e 08 e6 98 | ab 86 d7 e7 21 82 60 02 |!.`.....|....!.`.|
|00001f70| 0e 08 e8 98 ab 86 d7 e9 | 21 82 60 02 0e 08 ea 98 |........|!.`.....|
|00001f80| ab 86 d7 eb 21 82 60 02 | 0e 08 ec 98 ab 86 d7 ed |....!.`.|........|
|00001f90| 21 82 60 02 0e 08 ee 98 | ab 86 d7 ef 21 82 60 02 |!.`.....|....!.`.|
|00001fa0| 0e 08 f0 98 ab 86 d7 f1 | 21 82 60 02 0e 08 f2 98 |........|!.`.....|
|00001fb0| ab 86 d7 f3 21 82 60 02 | 0e 08 f4 98 ab 86 d7 f5 |....!.`.|........|
|00001fc0| 21 82 60 02 0e 08 f6 98 | ab 86 d7 f7 21 82 60 02 |!.`.....|....!.`.|
|00001fd0| 0e 08 f8 98 ab 86 d7 f9 | 21 82 60 02 0e 08 fa 98 |........|!.`.....|
|00001fe0| ab 86 d7 fb 21 82 60 02 | 0e 08 fc 98 ab 86 d7 fd |....!.`.|........|
|00001ff0| 21 82 60 02 0e 08 fe 98 | ab 86 d7 ff 21 82 60 02 |!.`.....|....!.`.|
|00002000| 0e 08 81 40 00 98 ab 88 | d7 81 41 00 21 82 60 02 |...@....|..A.!.`.|
|00002010| 0e 08 81 42 00 98 ab 88 | d7 81 43 00 21 82 60 02 |...B....|..C.!.`.|
|00002020| 0e 08 81 44 00 98 ab 88 | d7 81 45 00 21 82 60 02 |...D....|..E.!.`.|
|00002030| 0e 08 81 46 00 98 ab 88 | d7 81 47 00 21 82 60 02 |...F....|..G.!.`.|
|00002040| 0e 08 81 48 00 98 ab 88 | d7 81 49 00 21 82 60 02 |...H....|..I.!.`.|
|00002050| 0e 08 81 4a 00 98 ab 88 | d7 81 4b 00 21 82 60 02 |...J....|..K.!.`.|
|00002060| 0e 08 81 4c 00 98 ab 88 | d7 81 4d 00 21 82 60 02 |...L....|..M.!.`.|
|00002070| 0e 08 81 4e 00 98 ab 88 | d7 81 4f 00 21 82 60 02 |...N....|..O.!.`.|
|00002080| 0e 08 81 50 00 98 ab 88 | d7 81 51 00 21 82 60 02 |...P....|..Q.!.`.|
|00002090| 0e 08 81 52 00 98 ab 87 | d7 81 53 00 21 aa fd 0e |...R....|..S.!...|
|000020a0| 08 81 54 00 98 ab 87 d7 | 81 55 00 21 aa ee 0e 08 |..T.....|.U.!....|
|000020b0| 81 56 00 98 ab 87 d7 81 | 57 00 21 aa df 0e 08 81 |.V......|W.!.....|
|000020c0| 58 00 98 ab 87 d7 81 59 | 00 21 aa d0 0e 08 81 5a |X......Y|.!.....Z|
|000020d0| 00 98 ab 87 d7 81 5b 00 | 21 aa c1 0e 08 81 5c 5c |......[.|!.....\\|
|000020e0| 00 98 ab 87 d7 81 5d 00 | 21 aa b2 0e 08 81 5e 00 |......].|!.....^.|
|000020f0| 98 ab 87 d7 81 5f 00 21 | aa a3 0e 08 81 60 00 98 |....._.!|.....`..|
|00002100| ab 87 d7 81 61 00 21 aa | 94 0e 08 81 62 00 98 ab |....a.!.|....b...|
|00002110| 87 d7 81 63 00 21 aa 85 | c3 81 64 00 21 2c 87 22 |...c.!..|..d.!,."|
|00002120| 20 5b 6e 69 6c 20 6d 65 | 74 61 2d 62 75 66 2d 70 | [nil me|ta-buf-p|
|00002130| 20 65 64 69 66 66 2d 69 | 6e 2d 63 6f 6e 74 72 6f | ediff-i|n-contro|
|00002140| 6c 2d 62 75 66 66 65 72 | 2d 70 20 65 72 72 6f 72 |l-buffer|-p error|
|00002150| 20 22 25 53 3a 20 54 68 | 69 73 20 63 6f 6d 6d 61 | "%S: Th|is comma|
|00002160| 6e 64 20 72 75 6e 73 20 | 69 6e 20 45 64 69 66 66 |nd runs |in Ediff|
|00002170| 20 43 6f 6e 74 72 6f 6c | 20 42 75 66 66 65 72 20 | Control| Buffer |
|00002180| 6f 6e 6c 79 21 22 20 74 | 68 69 73 2d 63 6f 6d 6d |only!" t|his-comm|
|00002190| 61 6e 64 20 65 64 69 66 | 66 2d 65 76 65 6e 74 2d |and edif|f-event-|
|000021a0| 70 6f 69 6e 74 20 6c 61 | 73 74 2d 63 6f 6d 6d 61 |point la|st-comma|
|000021b0| 6e 64 2d 65 76 65 6e 74 | 20 63 6d 64 20 6f 76 65 |nd-event| cmd ove|
|000021c0| 72 6c 20 70 6f 73 20 65 | 64 69 66 66 2d 78 65 6d |rl pos e|diff-xem|
|000021d0| 61 63 73 2d 70 20 65 78 | 74 65 6e 74 2d 61 74 20 |acs-p ex|tent-at |
|000021e0| 65 64 69 66 66 2d 68 65 | 6c 70 2d 69 6e 66 6f 20 |ediff-he|lp-info |
|000021f0| 65 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 2d 67 65 |ediff-ov|erlay-ge|
|00002200| 74 20 6d 61 70 63 61 72 | 20 23 5b 28 65 6c 74 29 |t mapcar| #[(elt)|
|00002210| 20 22 c0 09 c2 5c 22 87 | 22 20 5b 6f 76 65 72 6c | "...\".|" [overl|
|00002220| 61 79 2d 67 65 74 20 65 | 6c 74 20 65 64 69 66 66 |ay-get e|lt ediff|
|00002230| 2d 68 65 6c 70 2d 69 6e | 66 6f 5d 20 33 5d 20 6f |-help-in|fo] 3] o|
|00002240| 76 65 72 6c 61 79 73 2d | 61 74 20 22 48 6d 6d 2e |verlays-|at "Hmm.|
|00002250| 2e 2e 20 49 20 64 6f 6e | 27 74 20 73 65 65 20 61 |.. I don|'t see a|
|00002260| 6e 20 45 64 69 66 66 20 | 63 6f 6d 6d 61 6e 64 20 |n Ediff |command |
|00002270| 61 72 6f 75 6e 64 20 68 | 65 72 65 2e 2e 2e 22 20 |around h|ere..." |
|00002280| 65 64 69 66 66 2d 64 6f | 63 75 6d 65 6e 74 61 74 |ediff-do|cumentat|
|00002290| 69 6f 6e 20 22 51 75 69 | 63 6b 20 48 65 6c 70 20 |ion "Qui|ck Help |
|000022a0| 43 6f 6d 6d 61 6e 64 73 | 22 20 63 61 73 65 2d 66 |Commands|" case-f|
|000022b0| 6f 6c 64 2d 73 65 61 72 | 63 68 20 22 3f 22 20 72 |old-sear|ch "?" r|
|000022c0| 65 2d 73 65 61 72 63 68 | 2d 66 6f 72 77 61 72 64 |e-search|-forward|
|000022d0| 20 22 5e 60 5c 5c 3f 27 | 22 20 22 47 22 20 22 5e | "^`\\?'|" "G" "^|
|000022e0| 60 47 27 22 20 22 45 22 | 20 22 5e 60 45 27 22 20 |`G'" "E"| "^`E'" |
|000022f0| 22 77 64 22 20 22 5e 60 | 77 64 27 22 20 22 77 78 |"wd" "^`|wd'" "wx|
|00002300| 22 20 22 5e 60 77 61 27 | 22 20 22 61 2f 62 22 20 |" "^`wa'|" "a/b" |
|00002310| 22 5e 60 61 27 22 20 22 | 78 22 20 22 78 79 22 20 |"^`a'" "|x" "xy" |
|00002320| 22 5e 60 61 62 27 22 20 | 22 70 2c 44 45 4c 22 20 |"^`ab'" |"p,DEL" |
|00002330| 22 5e 60 70 27 22 20 22 | 6e 2c 53 50 43 22 20 22 |"^`p'" "|n,SPC" "|
|00002340| 5e 60 6e 27 22 20 22 6a | 22 20 22 5e 60 6a 27 22 |^`n'" "j|" "^`j'"|
|00002350| 20 22 67 78 22 20 22 5e | 60 67 61 27 22 20 22 21 | "gx" "^|`ga'" "!|
|00002360| 22 20 22 5e 60 21 27 22 | 20 22 2a 22 20 22 5e 60 |" "^`!'"| "*" "^`|
|00002370| 5c 5c 2a 27 22 20 22 6d | 22 20 22 5e 60 6d 27 22 |\\*'" "m|" "^`m'"|
|00002380| 20 22 7c 22 20 22 5e 60 | 7c 27 22 20 22 40 22 20 | "|" "^`||'" "@" |
|00002390| 22 5e 60 40 27 22 20 22 | 68 22 20 22 5e 60 68 27 |"^`@'" "|h" "^`h'|
|000023a0| 22 20 22 72 22 20 22 5e | 60 72 27 22 20 22 72 78 |" "r" "^|`r'" "rx|
|000023b0| 22 20 22 5e 60 72 61 27 | 22 20 22 23 23 22 20 22 |" "^`ra'|" "##" "|
|000023c0| 5e 60 23 23 27 22 20 22 | 23 66 2f 23 68 22 20 22 |^`##'" "|#f/#h" "|
|000023d0| 5e 60 23 66 27 22 20 22 | 58 22 20 22 5e 60 41 27 |^`#f'" "|X" "^`A'|
|000023e0| 22 20 22 76 2f 56 22 20 | 22 5e 60 76 27 22 20 22 |" "v/V" |"^`v'" "|
|000023f0| 3c 2f 3e 22 20 22 5e 60 | 3c 27 22 20 22 7e 22 20 |</>" "^`|<'" "~" |
|00002400| 22 5e 60 7e 27 22 20 22 | 69 22 20 22 5e 60 69 27 |"^`~'" "|i" "^`i'|
|00002410| 22 20 22 44 22 20 22 5e | 60 44 27 22 20 22 52 22 |" "D" "^|`D'" "R"|
|00002420| 20 22 5e 60 52 27 22 20 | 22 4d 22 20 22 5e 60 4d | "^`R'" |"M" "^`M|
|00002430| 27 22 20 22 7a 2f 71 22 | 20 22 5e 60 7a 27 22 20 |'" "z/q"| "^`z'" |
|00002440| 22 25 22 20 22 5e 60 25 | 27 22 20 22 43 2d 6c 22 |"%" "^`%|'" "C-l"|
|00002450| 20 22 5e 60 43 2d 6c 27 | 22 20 22 24 22 20 22 5e | "^`C-l'|" "$" "^|
|00002460| 60 5c 5c 24 27 22 20 22 | 2f 22 20 22 5e 60 2f 27 |`\\$'" "|/" "^`/'|
|00002470| 22 20 22 26 22 20 22 5e | 60 26 27 22 20 22 73 22 |" "&" "^|`&'" "s"|
|00002480| 20 22 5e 60 73 27 22 20 | 22 2b 22 20 22 5e 60 5c | "^`s'" |"+" "^`\|
|00002490| 5c 2b 27 22 20 22 3d 22 | 20 22 5e 60 3d 27 22 20 |\+'" "="| "^`='" |
|000024a0| 22 55 6e 64 6f 63 75 6d | 65 6e 74 65 64 20 63 6f |"Undocum|ented co|
|000024b0| 6d 6d 61 6e 64 21 20 54 | 79 70 65 20 60 47 27 20 |mmand! T|ype `G' |
|000024c0| 69 6e 20 45 64 69 66 66 | 20 43 6f 6e 74 72 6f 6c |in Ediff| Control|
|000024d0| 20 50 61 6e 65 6c 20 74 | 6f 20 64 72 6f 70 20 61 | Panel t|o drop a|
|000024e0| 20 6e 6f 74 65 20 74 6f | 20 74 68 65 20 45 64 69 | note to| the Edi|
|000024f0| 66 66 20 6d 61 69 6e 74 | 61 69 6e 65 72 22 5d 20 |ff maint|ainer"] |
|00002500| 34 20 28 23 24 20 2e 20 | 37 37 37 38 29 20 6e 69 |4 (#$ . |7778) ni|
|00002510| 6c 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |l]).(def|alias 'e|
|00002520| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00002530| 65 2d 6c 69 6e 65 2d 6c | 65 6e 67 74 68 20 23 5b |e-line-l|ength #[|
|00002540| 6e 69 6c 20 22 8a 65 62 | 88 08 ab 84 c1 c2 21 88 |nil ".eb|......!.|
|00002550| c3 7f 88 69 29 87 22 20 | 5b 65 64 69 66 66 2d 75 |...i)." |[ediff-u|
|00002560| 73 65 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |se-long-|help-mes|
|00002570| 73 61 67 65 20 6e 65 78 | 74 2d 6c 69 6e 65 20 31 |sage nex|t-line 1|
|00002580| 20 6e 69 6c 5d 20 32 5d | 29 0a 28 64 65 66 61 6c | nil] 2]|).(defal|
|00002590| 69 61 73 20 27 65 64 69 | 66 66 2d 69 6e 64 65 6e |ias 'edi|ff-inden|
|000025a0| 74 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 23 |t-help-m|essage #|
|000025b0| 5b 6e 69 6c 20 22 c0 c1 | c2 20 21 c3 20 5a 5d c4 |[nil "..|. !. Z].|
|000025c0| a5 1d c6 0d c7 5c 22 1e | 08 8a 65 62 88 60 64 57 |.....\".|..eb.`dW|
|000025d0| ad 8c 0e 08 63 88 c0 79 | 88 c9 79 88 aa 6f 2b 87 |....c..y|..y..o+.|
|000025e0| 22 20 5b 30 20 77 69 6e | 64 6f 77 2d 77 69 64 74 |" [0 win|dow-widt|
|000025f0| 68 20 73 65 6c 65 63 74 | 65 64 2d 77 69 6e 64 6f |h select|ed-windo|
|00002600| 77 20 65 64 69 66 66 2d | 68 65 6c 70 2d 6d 65 73 |w ediff-|help-mes|
|00002610| 73 61 67 65 2d 6c 69 6e | 65 2d 6c 65 6e 67 74 68 |sage-lin|e-length|
|00002620| 20 32 20 73 68 69 66 74 | 20 6d 61 6b 65 2d 73 74 | 2 shift| make-st|
|00002630| 72 69 6e 67 20 3f 5c 20 | 20 73 74 72 20 31 5d 20 |ring ?\ | str 1] |
|00002640| 33 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |3]).(def|alias 'e|
|00002650| 64 69 66 66 2d 73 65 74 | 2d 68 65 6c 70 2d 6d 65 |diff-set|-help-me|
|00002660| 73 73 61 67 65 20 23 5b | 6e 69 6c 20 22 08 ab 8c |ssage #[|nil "...|
|00002670| 08 39 ac 84 08 3a ab 84 | 08 20 aa ae 09 ab 86 5c |.9...:..|. .....\|
|00002680| 6e 0b 0c 51 aa a5 0d ab | 87 5c 6e 0e 06 0c 51 aa |n..Q....|.\n...Q.|
|00002690| 9b 0e 07 ab 87 5c 6e 0e | 08 0c 51 aa 90 0e 09 ab |.....\n.|..Q.....|
|000026a0| 87 5c 6e 0e 5c 6e 0c 51 | aa 85 5c 6e 0e 0b 0c 51 |.\n.\n.Q|..\n...Q|
|000026b0| 16 0c 0e 0d ab 8f 0e 0d | 39 ac 85 0e 0d 3a ab 85 |........|9....:..|
|000026c0| 0e 0d 20 aa 97 0e 0d 3b | ab 84 0e 0d aa 8e ce 20 |.. ....;|....... |
|000026d0| ab 88 0e 0f ab 84 0e 10 | aa 82 0e 10 16 11 0e 12 |........|........|
|000026e0| ab 84 0e 0c aa 82 0e 11 | 16 13 d4 d5 21 87 22 20 |........|....!." |
|000026f0| 5b 65 64 69 66 66 2d 6c | 6f 6e 67 2d 68 65 6c 70 |[ediff-l|ong-help|
|00002700| 2d 6d 65 73 73 61 67 65 | 2d 66 75 6e 63 74 69 6f |-message|-functio|
|00002710| 6e 20 65 64 69 66 66 2d | 77 6f 72 64 2d 6d 6f 64 |n ediff-|word-mod|
|00002720| 65 20 65 64 69 66 66 2d | 6c 6f 6e 67 2d 68 65 6c |e ediff-|long-hel|
|00002730| 70 2d 6d 65 73 73 61 67 | 65 2d 68 65 61 64 20 65 |p-messag|e-head e|
|00002740| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|00002750| 65 73 73 61 67 65 2d 77 | 6f 72 64 2d 6d 6f 64 65 |essage-w|ord-mode|
|00002760| 20 65 64 69 66 66 2d 6c | 6f 6e 67 2d 68 65 6c 70 | ediff-l|ong-help|
|00002770| 2d 6d 65 73 73 61 67 65 | 2d 74 61 69 6c 20 65 64 |-message|-tail ed|
|00002780| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 6a 6f 62 20 65 |iff-narr|ow-job e|
|00002790| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|000027a0| 65 73 73 61 67 65 2d 6e | 61 72 72 6f 77 32 20 65 |essage-n|arrow2 e|
|000027b0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 6a 6f 62 20 65 |diff-mer|ge-job e|
|000027c0| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|000027d0| 65 73 73 61 67 65 2d 6d | 65 72 67 65 20 65 64 69 |essage-m|erge edi|
|000027e0| 66 66 2d 64 69 66 66 33 | 2d 6a 6f 62 20 65 64 69 |ff-diff3|-job edi|
|000027f0| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00002800| 73 61 67 65 2d 63 6f 6d | 70 61 72 65 33 20 65 64 |sage-com|pare3 ed|
|00002810| 69 66 66 2d 6c 6f 6e 67 | 2d 68 65 6c 70 2d 6d 65 |iff-long|-help-me|
|00002820| 73 73 61 67 65 2d 63 6f | 6d 70 61 72 65 32 20 65 |ssage-co|mpare2 e|
|00002830| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|00002840| 65 73 73 61 67 65 20 65 | 64 69 66 66 2d 62 72 69 |essage e|diff-bri|
|00002850| 65 66 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ef-help-|message-|
|00002860| 66 75 6e 63 74 69 6f 6e | 20 65 64 69 66 66 2d 77 |function| ediff-w|
|00002870| 69 6e 64 6f 77 2d 64 69 | 73 70 6c 61 79 2d 70 20 |indow-di|splay-p |
|00002880| 65 64 69 66 66 2d 6d 75 | 6c 74 69 66 72 61 6d 65 |ediff-mu|ltiframe|
|00002890| 20 65 64 69 66 66 2d 62 | 72 69 65 66 2d 6d 65 73 | ediff-b|rief-mes|
|000028a0| 73 61 67 65 2d 73 74 72 | 69 6e 67 20 65 64 69 66 |sage-str|ing edif|
|000028b0| 66 2d 62 72 69 65 66 2d | 68 65 6c 70 2d 6d 65 73 |f-brief-|help-mes|
|000028c0| 73 61 67 65 20 65 64 69 | 66 66 2d 75 73 65 2d 6c |sage edi|ff-use-l|
|000028d0| 6f 6e 67 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |ong-help|-message|
|000028e0| 20 65 64 69 66 66 2d 68 | 65 6c 70 2d 6d 65 73 73 | ediff-h|elp-mess|
|000028f0| 61 67 65 20 72 75 6e 2d | 68 6f 6f 6b 73 20 65 64 |age run-|hooks ed|
|00002900| 69 66 66 2d 64 69 73 70 | 6c 61 79 2d 68 65 6c 70 |iff-disp|lay-help|
|00002910| 2d 68 6f 6f 6b 5d 20 33 | 5d 29 0a |-hook] 3|]). |
+--------+-------------------------+-------------------------+--------+--------+
